wayland: Make the code here a bit clearer
authorJasper St. Pierre <jstpierre@mecheye.net>
Mon, 16 Sep 2013 22:38:15 +0000 (18:38 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Mon, 28 Oct 2013 22:03:26 +0000 (18:03 -0400)
By grouping the destroy and field clear together.

gdk/wayland/gdkwindow-wayland.c

index 6fdbc7792215db5aa3965a8b951dd812265b6871..26afb1f98d07b224379663fca7348d3181eec2b2 100644 (file)
@@ -1101,8 +1101,6 @@ gdk_wayland_window_hide_surface (GdkWindow *window,
 
   if (impl->surface)
     {
-      if (impl->shell_surface)
-        wl_shell_surface_destroy (impl->shell_surface);
       if (impl->use_custom_surface && !is_destroy)
         {
           wl_surface_attach (impl->surface, NULL, 0, 0);
@@ -1120,7 +1118,13 @@ gdk_wayland_window_hide_surface (GdkWindow *window,
           g_slist_free (impl->outputs);
           impl->outputs = NULL;
         }
-      impl->shell_surface = NULL;
+
+      if (impl->shell_surface)
+        {
+          wl_shell_surface_destroy (impl->shell_surface);
+          impl->shell_surface = NULL;
+        }
+
       cairo_surface_destroy (impl->server_surface);
       impl->server_surface = NULL;
     }